updated to latest changes from original repository and converted the
project to maven.