First real commit
Merge pull request #1 from tomaka/master

First real commit