Premerge commit
Merge branch 'master' of https://github.com/WinToosa/mobilelogger.git