Merge pull request #1 from MrazqRuby/master

0001
Merge pull request #2 from skeleta/master

Merge pull request #1 from MrazqRuby/master