diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5e8ed84..709668f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,7 +85,9 @@ FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED) # tested on Qt4.8
 ADD_DEFINITIONS(-DQT_NO_KEYWORDS) # To avoid conflicts with boost signals used in ROS
 
 ####### OSX BUNDLE CMAKE_INSTALL_PREFIX #######
-OPTION(BUILD_AS_BUNDLE "Set to ON to build as bundle (DragNDrop)" OFF)
+IF(APPLE)
+	OPTION(BUILD_AS_BUNDLE "Set to ON to build as bundle (DragNDrop)" OFF)
+ENDIF(APPLE)
 IF(APPLE AND BUILD_AS_BUNDLE) 
     # Required when packaging, and set CMAKE_INSTALL_PREFIX to "/".
     SET(CPACK_SET_DESTDIR TRUE) 
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index beb2e1c6..45fe8210 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -77,8 +77,8 @@ IF(APPLE AND BUILD_AS_BUNDLE)
         WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
 ENDIF(APPLE AND BUILD_AS_BUNDLE)
 
-SET(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
 IF((APPLE AND BUILD_AS_BUNDLE) OR WIN32)
+  SET(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
   SET(plugin_dest_dir bin)
   SET(qtconf_dest_dir bin)
   IF(APPLE)
diff --git a/app/main.cpp b/app/main.cpp
index b3519ba4..417a95af 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -137,6 +137,13 @@ int main(int argc, char* argv[])
 
 	for(int i=1; i<argc; ++i)
 	{
+#ifdef __APPLE__
+		if(QString(argv[i]).startsWith("-psn"))
+		{
+			//safely ignore
+			continue;
+		}
+#endif
 		if(strcmp(argv[i], "-objs") == 0 ||
 		   strcmp(argv[i], "--objs") == 0 ||
 		   strcmp(argv[i], "-objects") == 0 ||
@@ -474,4 +481,5 @@ int main(int argc, char* argv[])
 
 		delete findObject;
 	}
+	return 0;
 }