Merge pull request #28 from VBoden/master