- Fix for CRAFTERCMS-18 and CRAFTERCMS-19.
- Added more javadoc.
Merge remote-tracking branch 'alfonso/master'