Merge pull request #202 from edmaas/pull_request