Updates to make XGAP compile again, also the unittest works again. closes issue #32
Code beautification, removing extra output
Merge branch 'master' into xchr