test removed
improvements
Merge pull request #15 from nikitoz/master

merge