fixing some bugs
do merge

Merge branch 'master' of https://github.com/tnason/CoE1186