Merge pull request #316 from jfoug/master