Merge pull request #42 from flashii/master

why do i always need to do this, i don't get it