refactor
Merge branch 'dev' of github.com:island205/Thunder into dev