Merge pull request #186 from edmaas/master