Fix the build
Merge pull request #29 from riking/refactoring

Fix the build