Merge pull request #209 from edmaas/master