Committing to resolve header issue
Merge pull request #116 from binbin4649/hotfixes_1st_sept_2014

Committing to resolve header issue #83