Update #4

- Updated to maven.
- Minor changes.