Some housekeeping…
Merge pull request #3 from persand/feat/housekeeping

Some housekeeping…