cores--
Merge pull request #98 from ryanpcmcquen/master

cores--