Fixing some bugs and updated pom.xml to version 1.0