Removed features that aren't supported. and stuff
Merge pull request #75 from photonicgeek/master

Fixed stuff