continue to improve
Merge branch 'master' of http://github.com/doomdagger/s_framework