Fixed bugs, added tests, changed config file name
Added more tests. Fixed bugs
Merge pull request #2 from emson/bugfixes

Bugfixes