Merge pull request #1 from evildmp/master

merging from evildmp master