First import
Refactoring
Refactoring
Add javadoc comments
Refs #2