House keeping
Merge pull request #3 from graymalkin/changes

House keeping