Merge pull request #19 from Stormion/release/1.0

Release/1.0
Merge pull request #21 from Stormion/hotfix/javadocbug

Hotfix/javadocbug
Update pom.xml

Fixed bug in version number.
Fixed bug in javadoc
Updated version number to match develop
Merge pull request #23 from Stormion/hotfix/javadoc

Hotfix/javadoc