merged colormap branch, released new binary for osx