Merge pull request #8 from ParadiseSS13/master

Merge from Master
Merge pull request #9 from ParadiseSS13/master

Merge From Master
Cell Changes  and other Stuff
Merge pull request #41 from Fox-McCloud/Cell-Changes

Cell changes