Merge pull request #1 from adawerrek/master

First