Merge #35

Thanks @Aerouk

commit 9485d4ee3ca49159da43af933b18fa47dccba28b
Author: Aerouk
Date:   2013-08-17 11:12:18 +0100

miscellaneous javadoc fixes - added some spacing - added some class/method descriptions