fixes #28 and fixes #29
fixes #28 and fixes #29

Sagi363/ShapeShifter,alexjlockwood/ShapeShifter,alexjlockwood/ShapeShifter,alexjlockwood/ShapeShifter,alexjlockwood/ShapeShifter,Sagi363/ShapeShifter,Sagi363/ShapeShifter