Merge pull request #1 from evildmp/master

merging upstream master on Github
added my github name
fixed conflict
merge keith