fixed issue 2
Merge branch 'activedev' of https://github.com/WheatonCS/Lexos into activedev