Merge pull request #1 from squeeks/squeek-cleanup

Module cleanup
Merge remote-tracking branch 'upstream/master'
wip
wip