debug info, tests instead of demo, fixed bugs
Merge pull request #2 from iliabeluch/master

debug info, tests instead of demo, fixed bugs