modifications to fit with core v1.0.6
some cleanup of unnecessary stuff
new line added
Merge pull request #221 from voisardf/core106

modifications to fit with core v1.0.6