Merge pull request #18 from Stormion/release/1.0

Release/1.0
Bumped version number
Issue #7: Fixed bug in javadoc
Merge pull request #21 from Stormion/hotfix/javadocbug

Hotfix/javadocbug