Not sure what changes I made since it has been a while.
Merge branch 'master' of https://github.com/Surakusa/surakusaMarionette