Merge pull request #111 from kevingy/master

Fix Mono Build
Merge pull request #112 from kevingy/master

Undo breaking change