Reindeted and tried to conform to rust-style-guide
Merge pull request #46 from leonkunert/master

Reindeted and tried to conform to rust-style-guide