Merge pull request #110 from kevingy/master

Fix broken build and Issue #93