Just line break differences
Merge official repo, so I can start working on the official version and create pull request
Update readme and .gitignore
Merge pull request #72 from dekpient/master

This pull request should not cause any conflict (of course!), I just merge it.