Merge pull request #12 from Mordonus/master

Update