fixed bug #159
Merge branch 'master' of https://github.com/Wolframe/Wolframe into reorganizeMain
reorganize main -- work in progress