Merge pull request #696 from tjcsl/master

merge dev
maybe
mode.py
Merge pull request #697 from tjcsl/dev

Dev