Moar changes.
Merge pull request #182 from ZAM-/master

Moar changes.