Merge pull request #11 from jetej/test

test2 merge into test (2)