merge pull request 23 into master