Merge pull request #4 from najela/wip

Wip
Merge pull request #37 from najela/master

Merge pull request #4 from najela/wip