Merge pull request #1 from justlaputa/master

First version with test case