Fixed issue #105
Merge branch 'codeviewer-master' of https://github.com/HGustavs/LenaSYS_2014 into codeviewer-master