Commit bug 101
merge bug 101 to branch dev
Merge TestDemo.txt
Merge branch 'dev'