Merge pull request #1 from mdluo/master

Merged from mdluo/scuol-android