Merge pull request #1 from CleverRaven/master

is this right