Bug #52 & 35 FIX
Merge branch 'master' of https://github.com/barretoluis/se165