added/updated javadoc; fixed issue #56 #67

Closed n-duncan closed 7 years ago