Merge pull request #47 from ercchy/master

Starting to style the stuff
Merge pull request #48 from ercchy/master

Continues integration bugfix