Merge pull request #15 from Maxell/master