some tests added
Merge branch 'master' of https://github.com/invaa/SampleProject