Merge pull request #1 from clinton-hall/dev

Dev
fixed indentation and some minor cleanup
Merge pull request #74 from jkaberg/dev

Dev