Merge pull request #24 into master

Merge pull request for issue #24