GitHub style 2014
Merge pull request #71 from olvlvl/github_style_2014

GitHub style 2014