Update #5

- Changes for maven.
- Minor changes.