Merge pull request #1 from skyrising/master

234
Merge branch 'master' into lemuecke-dev