Fixes Issue 12
Fixes Issue 13
Fixes Issue 14
Update Issue 14

Different implementation
Update Issue 14

Reduce log level
Update Issue 14

Add more Javadoc