Beautiful code
Merge pull request #29 from loictrichaud/beautifulCode

Beautiful code