merge
Merge branch 'master' of git://github.com/kiriaze/simple-framework