Committing to resolve issues.
Merge pull request #117 from binbin4649/hotfixes_2nd_sept_2014

Committing to resolve issues.