First commit by WojtekS
Merge pull request #140 from Dragonis/master

First commit by WojtekS