fix bug#92 #94
Merge branch 'master' of https://github.com/yilu282/Qsystem