Merge branch 'master' of github.com:etamity/SmartEngine

Signed-off-by: etamity <etamity@gmail.com>
Merge branch 'master' of github.com:etamity/SmartEngine