Some house keeping
Merge pull request #71 from shocm/development

Some house keeping