Merge pull request #14 into master