Fixes to makefiles
Docstring fixes
Merge pull request #16 from endlessm/stopper

Stopper