core files
Merge pull request #1 from samaitra/master

core files