Merge pull request #13 from akitchen/master

A little spring cleaning