Cleanup and minor changes
Merge pull request #16 from svalinn/initial_setup

Cleanup and minor changes