Merge pull request #12 from Mordonus/master

Update
Merge pull request #18 from Mordonus/Adam

Merge pull request #12 from Mordonus/master