Merge pull request #175 from bgermann/master