Merge branch 'develop' of github.com:stdrickforce/sakura into develop