~~~~~
Merge pull request #1 from luokk/master

First pull request about some changes