- minor changes
- first attempt to migrate the project as maven project
- minor bug fixing