state moving base done
Merge branch 'master' of https://github.com/golgoth/sand-castle