added javadoc
added comments
fix merge conflicts
Merge pull request #6 from inderdhir/develop

Develop
Merge remote-tracking branch 'origin' into eli