Merge pull request #2 from Irodigrion/master

kjnk