Merge pull request #26 from pulkomandy/master