Merge pull request #20 from pulkomandy/master