Merge pull request #33 from ParadiseSS13/master

Merge from Master
crate-fix
Merge pull request #115 from Fox-McCloud/crate-fix

Crate fix