Bugfix, some updates.
Merge branch 'master' of https://github.com/foxhead128/clip-rpg