Bug CON-94 fix
Merge branch 'pr/19' into develop
javadoc and formatting cleanup
fix bug and add unit tests
adding missing file
change shortcut in CaSH
integration tests
add logging