Removed main-method. Test programs are or will be written in JUnit tests.
Merge remote-tracking branch 'origin/master'
Added more unit tests.