Modified to build with the lastest version from git 0.3.0.