Fixes issue #8 https://github.com/ap4y/OrigamiEngine/issues/8
Fixes issue #6 and #7 https://github.com/ap4y/OrigamiEngine/issues/6 https://github.com/ap4y/OrigamiEngine/issues/7
Merge pull request #9 from lawicko/master

Fixes for issues #6, #7 and #8