add tests, fix a bug, conicidence !?
cli options + more tests
Merge pull request #6 from grosser/tests

cli options and tests