-merging changes with remote repo
Merge pull request #40 from johnstoecker/core

Merging local changes with Raxa repo