Fix compile error
Merge pull request #11 from dchest/patch-1

Fix compile error
fix a bad merge
Merge branch 'master' into v2