Merge pull request #75 from photonicgeek/master

Fixed stuff