- Compile fix for clang.
 - Added support for macosx bundle