Few more fixes and support for Mac OSX.
Merge branch 'master' of https://github.com/dominique120/rme