improved coding style, fixing #21 #22
fixing #25
fixing #23
Merge pull request #29 from nicolagreco/coding-style

Improved coding style, fixing #21 #22 #23 #25