Merge pull request #23 from PurpleKangaroo/master

LW expansion changes
Merge pull request #24 from PurpleKangaroo/master

small changes
javadoc
Merge pull request #290 from HoltMaki/master

Javadoc