stuff and things
Merge pull request #184 from ZAM-/master

stuff and things