reorganized & added tests
Merge pull request #12 from sutamatej/master

reorganized & added tests