fix bug 101
merged bug fix 101
Merge branch 'master' of github.com:hcds/myGit
version 2