bug 2 working
Merge branch 'master' of https://github.com/elms1990/mc715