upgraded CS-Map to trunk which includes the previous fixes for Mac