Changes to basic layout and some speed increases in string handling
Merge branch 'master' of https://github.com/EluOne/Nema