1.6.2 Update

Heavily untested!
Merge pull request #91 from CaptainShadows/master

basic 1.6.2 Update