Merge branch 'dev'
Fix for https://github.com/GsDevKit/zinc/issues/59