Fixed some compiler errors
Merge branch 'master' of github.com:hhariri/wasabi