diff --git a/README.md b/README.md
index 80f0ee7dcc..a708b5be4a 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ You can install and run the NativeScript CLI on Windows or OS X.
 > On Windows systems, you can develop, build, and deploy NativeScript projects that target Android.
 
 * Windows Vista or later
-* [Node.js 0.10.26] or a later stable official [0.10.x] release
+* [Node.js 0.10.26] or a later stable official release
 * (Optional) [Chocolatey]
 * [JDK 6] or a later stable official release
 * [Apache Ant 1.8] or a later stable official release
@@ -136,11 +136,12 @@ If you have installed Chocolatey, you can complete these steps to set up JDK, Ap
 > On OS X systems, you can develop, build, and deploy NativeScript projects that target iOS and Android.
 
 * OS X Mavericks
-* [Node.js 0.10.26] or a later stable official [0.10.x] release
+* [Node.js 0.10.26] or a later stable official release
 * For iOS development
 	* [iOS 7.0 SDK][12] or a later stable official release
 	* [Xcode 5][12] or a later stable official release
 	* [Xcode command-line tools][12]
+	* (Optional) [Mono] installed via Homebrew
 * For Android development
 	* [JDK 6] or a later stable official release 
 	* [Apache Ant 1.8] or a later stable official release
@@ -470,4 +471,5 @@ This software is licensed under the Apache 2.0 license, quoted <a href="LICENSE"
 [JDK 6]: http://www.oracle.com/technetwork/java/javase/downloads/index.html
 [Apache Ant 1.8]: http://ant.apache.org/bindownload.cgi
 [Android SDK 19]: http://developer.android.com/sdk/index.html
-[Genymotion]: https://www.genymotion.com/#!/
\ No newline at end of file
+[Genymotion]: https://www.genymotion.com/#!/
+[Mono]: http://www.mono-project.com
\ No newline at end of file
diff --git a/lib/options.ts b/lib/options.ts
index a7328632c3..867a6226ce 100644
--- a/lib/options.ts
+++ b/lib/options.ts
@@ -9,10 +9,14 @@ import hostInfo = require("./common/host-info");
 var knownOpts:any = {
 		"frameworkPath": String,
 		"copy-from": String,
+		"copyFrom": String,
 		"link-to": String,
+		"linkTo": String,
 		"release": Boolean,
 		"emulator": Boolean,
 		"symlink": Boolean,
+		"forDevice": Boolean,
+		"for-device": Boolean,
 		"keyStorePath": String,
 		"keyStorePassword": String,
 		"keyStoreAlias": String,
diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts
index ee3834946d..70b0ccb0f1 100644
--- a/lib/services/ios-project-service.ts
+++ b/lib/services/ios-project-service.ts
@@ -132,14 +132,7 @@ class IOSProjectService implements  IPlatformProjectService {
 			];
 			var args: string[] = [];
 
-			if(options.emulator) {
-				args = basicArgs.concat([
-					"-sdk", "iphonesimulator",
-					"-arch", "i386",
-					"VALID_ARCHS=\"i386\"",
-					"CONFIGURATION_BUILD_DIR=" + path.join(projectRoot, "build", "emulator")
-				]);
-			} else {
+			if(options.forDevice) {
 				args = basicArgs.concat([
 					"-xcconfig", path.join(projectRoot, this.$projectData.projectName, "build.xcconfig"),
 					"-sdk", "iphoneos",
@@ -147,11 +140,19 @@ class IOSProjectService implements  IPlatformProjectService {
 					'VALID_ARCHS=armv7 arm64',
 					"CONFIGURATION_BUILD_DIR=" + path.join(projectRoot, "build", "device")
 				]);
+			} else {
+				args = basicArgs.concat([
+					"-sdk", "iphonesimulator",
+					"-arch", "i386",
+					"VALID_ARCHS=\"i386\"",
+					"CONFIGURATION_BUILD_DIR=" + path.join(projectRoot, "build", "emulator")
+				]);
+
 			}
 
 			this.$childProcess.spawnFromEvent("xcodebuild", args, "exit", {cwd: options, stdio: 'inherit'}).wait();
 
-			if(!options.emulator) {
+			if(options.forDevice) {
 				var buildOutputPath = path.join(projectRoot, "build", "device");
 
 				// Produce ipa file
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
index 6fa5f8de60..1652ea14f9 100644
--- a/lib/services/platform-service.ts
+++ b/lib/services/platform-service.ts
@@ -74,6 +74,7 @@ export class PlatformService implements IPlatformService {
 
 			var downloadedPackagePath = this.$npm.install(packageToInstall, npmOptions).wait();
 			var frameworkDir = path.join(downloadedPackagePath, constants.PROJECT_FRAMEWORK_FOLDER_NAME);
+			frameworkDir = path.resolve(frameworkDir);
 
 			try {
 				this.addPlatformCore(platformData, frameworkDir).wait();
@@ -92,7 +93,7 @@ export class PlatformService implements IPlatformService {
 			platformData.platformProjectService.createProject(platformData.projectRoot, frameworkDir).wait();
 			var installedVersion = this.$fs.readJson(path.join(frameworkDir, "../", "package.json")).wait().version;
 
-			if(options.frameworkPath && !options.symlink) {
+			if(options.frameworkPath && this.$fs.getFsStats(options.frameworkPath).wait().isFile() && !options.symlink) {
 				// Need to remove unneeded node_modules folder
 				// One level up is the runtime module and one above is the node_modules folder.
 				this.$fs.deleteDirectory(path.join(frameworkDir, "../../")).wait();
@@ -217,7 +218,10 @@ export class PlatformService implements IPlatformService {
 
 				var platformData = this.$platformsData.getPlatformData(platform);
 
+				var cachedDeviceOption = options.forDevice;
+				options.forDevice = true;
 				this.buildPlatform(platform).wait();
+				options.forDevice = cachedDeviceOption;
 
 				packageFile = this.getLatestApplicationPackageForDevice(platformData).wait().packageName;
 				this.$logger.out("Using ", packageFile);
@@ -261,7 +265,10 @@ export class PlatformService implements IPlatformService {
 
 			var platformData = this.$platformsData.getPlatformData(platform);
 
+			var cachedDeviceOption = options.forDevice;
+			options.forDevice = true;
 			this.buildPlatform(platform).wait();
+			options.forDevice = cachedDeviceOption;
 
 			// Get latest package that is produced from build
 			var packageFile = this.getLatestApplicationPackageForDevice(platformData).wait().packageName;
@@ -286,10 +293,7 @@ export class PlatformService implements IPlatformService {
 			emulatorServices.checkDependencies().wait();
 
 			if(!options.availableDevices) {
-				var cachedEmulatorOption = options.emulator;
-				options.emulator = true;
 				this.buildPlatform(platform).wait();
-				options.emulator = cachedEmulatorOption;
 
 				var packageFile = this.getLatestApplicationPackageForEmulator(platformData).wait().packageName;
 				this.$logger.out("Using ", packageFile);
diff --git a/package.json b/package.json
index 2d4f3dcbf5..740a1eac41 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "0.4.2",
+  "version": "0.9.0",
   "author": "Telerik <support@telerik.com>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {
@@ -49,7 +49,7 @@
     "prompt": "https://github.com/Icenium/prompt/tarball/master",
     "properties-parser": "0.2.3",
     "ref": "https://github.com/icenium/ref/tarball/master",
-    "ref-struct": "0.0.5",
+    "ref-struct": "https://github.com/telerik/ref-struct/tarball/master",
     "rimraf": "2.2.6",
     "semver": "3.0.1",
     "shelljs": "0.3.0",
@@ -77,6 +77,6 @@
   },
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=0.10.26 <0.10.34 || >=0.10.35 <0.11.0"
+    "node": ">=0.10.26 <0.10.34 || >=0.10.35"
   }
 }
diff --git a/resources/help.txt b/resources/help.txt
index 3b8e716063..b136156cee 100644
--- a/resources/help.txt
+++ b/resources/help.txt
@@ -278,7 +278,7 @@ Options:
 --[build|ios]--
 
 Usage:
-    $ tns build ios [--device] [--release]
+    $ tns build ios [--forDevice] [--release]
 
 Builds the project for iOS and produces an APP or IPA that you can manually deploy in the iOS Simulator or on device, respectively.
 
@@ -286,7 +286,7 @@ Before building for iOS device, verify that you have configured a valid pair of
 
 Options:
     --release - If set, produces a release build. Otherwise, produces a debug build.
-    --device - If set, produces an application package that you can deploy on device. 
+    --forDevice - If set, produces an application package that you can deploy on device.
                Otherwise, produces a build that you can run only in the native iOS Simulator.
 
 --[/]--