Javadoc fixes [7/8]
Merge #61

Thanks @Aerouk

commit da548c18a0865be75c8c8ccafe5a155283d7d39c
Author: aerouk
Date:   2013-12-11 20:00:27 +0000

Javadoc fixes [7/8]