To get rid of Eclipse warnings.
Merge pull request #13 from eric-wu/develop

To get rid of Eclipse warnings.