testing branch
Merge pull request #2 from comamitc/corework

testing branch