Merge commit 'refs/pull/14/head' of https://github.com/feroxneto/mshengu
Merge branch 'master' of https://github.com/feroxneto/mshengu