Merge pull request #183 from edmaas/master