Merge pull request #12 from jetej/test2

Merge pull request #11 from jetej/test