Merge pull request 41 into master