Merge pull request #1 from adawerrek/master

First
Merge pull request #2 from adawerrek/dev

Merge pull request #1 from adawerrek/master