diff --git a/it.baeyens.arduino.core/META-INF/MANIFEST.MF b/it.baeyens.arduino.core/META-INF/MANIFEST.MF
index 1be7ae451..39bd85d9c 100644
--- a/it.baeyens.arduino.core/META-INF/MANIFEST.MF
+++ b/it.baeyens.arduino.core/META-INF/MANIFEST.MF
@@ -30,6 +30,7 @@ Require-Bundle: org.eclipse.cdt.managedbuilder.core,
  org.eclipse.core.filesystem,
  org.eclipse.cdt.core,
  org.apache.commons.compress,
+ org.apache.commons.lang,
  com.google.gson,
  org.eclipse.equinox.security,
  org.eclipse.ui.forms,
@@ -37,4 +38,5 @@ Require-Bundle: org.eclipse.cdt.managedbuilder.core,
  org.apache.commons.io,
  org.eclipse.core.resources,
  org.eclipse.ui.ide,
- org.eclipse.ui
+ org.eclipse.ui,
+ org.eclipse.debug.ui
diff --git a/it.baeyens.arduino.core/icons/16px-upload.png b/it.baeyens.arduino.core/icons/16px-upload.png
new file mode 100644
index 000000000..8b1b4d019
Binary files /dev/null and b/it.baeyens.arduino.core/icons/16px-upload.png differ
diff --git a/it.baeyens.arduino.core/plugin.xml b/it.baeyens.arduino.core/plugin.xml
index 897f7a9f1..ffe28ce5e 100644
--- a/it.baeyens.arduino.core/plugin.xml
+++ b/it.baeyens.arduino.core/plugin.xml
@@ -180,6 +180,80 @@
       </page>
    </extension>
 
+<!--
+####################################################################################### 
+#    Launch Configuration                                                             #
+####################################################################################### 
+-->
+<!-- Arduino Launch Configuration -->
+    <extension
+         point="org.eclipse.debug.core.launchConfigurationTypes">
+      <launchConfigurationType
+            delegate="it.baeyens.arduino.tools.LaunchConfiguration"
+            id="it.baeyens.arduino.tools.arduinoLaunchConfiguration"
+            modes="run, debug"
+            name="Arduino Launch"
+            public="true">
+      </launchConfigurationType>
+   </extension>
+
+<!-- Launch Configuration Tab Group -->
+    <extension
+         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
+      <launchConfigurationTabGroup
+            class="it.baeyens.arduino.ui.launchconfig.LaunchConfigurationTabGroup"
+            id="it.baeyens.arduino.ui.launchconfig.arduinoLaunchConfigurationTabGroup"
+            type="it.baeyens.arduino.tools.arduinoLaunchConfiguration">
+         <launchMode
+               mode="run">
+         </launchMode>
+         <launchMode
+               mode="debug">
+         </launchMode>
+      </launchConfigurationTabGroup>
+   </extension>
+   
+<!-- Launch Configuration Image -->
+    <extension
+         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+      <launchConfigurationTypeImage
+            configTypeID="it.baeyens.arduino.tools.arduinoLaunchConfiguration"
+            icon="icons/16px-upload.png"
+            id="it.baeyens.arduino.tools.arduinoLaunchConfigurationTypeImages">
+      </launchConfigurationTypeImage>
+   </extension>
+   
+<!-- Launch Shortcut -->
+    <extension
+         point="org.eclipse.debug.ui.launchShortcuts">
+      <shortcut
+            class="it.baeyens.arduino.ui.launchconfig.LaunchShortcut"
+            icon="icons/16px-upload.png"
+            id="it.baeyens.arduino.ui.launchconfig.launchShortcut"
+            label="Arduino Launch"
+            modes="run, debug">
+         <contextualLaunch>
+            <enablement>
+               <with
+                     variable="selection">
+                  <count
+                        value="1">
+                  </count>
+                  <iterate>
+                     <or>
+                        <test
+                              forcePluginActivation="false"
+                              property="org.eclipse.debug.ui.matchesPattern"
+                              value="*.ino">
+                        </test>
+                     </or>
+                  </iterate>
+               </with>
+            </enablement>
+         </contextualLaunch>
+      </shortcut>
+   </extension>
+   
 <!--
 ####################################################################################### 
 #    Arduino Plugin Commands                                                              # 
diff --git a/it.baeyens.arduino.core/src/it/baeyens/arduino/actions/UploadProjectHandler.java b/it.baeyens.arduino.core/src/it/baeyens/arduino/actions/UploadProjectHandler.java
index a6fc26c0e..b660e3523 100644
--- a/it.baeyens.arduino.core/src/it/baeyens/arduino/actions/UploadProjectHandler.java
+++ b/it.baeyens.arduino.core/src/it/baeyens/arduino/actions/UploadProjectHandler.java
@@ -28,89 +28,99 @@
 import it.baeyens.arduino.tools.uploaders.UploadSketchWrapper;
 
 class UploadJobHandler extends Job {
-    IProject myBuildProject = null;
+	IProject myBuildProject = null;
 
-    public UploadJobHandler(IProject buildProject) {
-	super(Messages.ArduinoUploadProjectHandler_Upload_for_project + buildProject.getName());
-	this.myBuildProject = buildProject;
-    }
+	public UploadJobHandler(IProject buildProject) {
+		super(Messages.ArduinoUploadProjectHandler_Upload_for_project + buildProject.getName());
+		this.myBuildProject = buildProject;
+	}
 
-    @Override
-    protected IStatus run(IProgressMonitor monitor) {
-	if (InstancePreferences.getBuildBeforeUploadOption()) {
-	    try {
-		this.myBuildProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);
-		Job job = new Job("Start build Activator") { //$NON-NLS-1$
-		    @Override
-		    protected IStatus run(IProgressMonitor _monitor) {
+	@Override
+	protected IStatus run(IProgressMonitor monitor) {
+		if (InstancePreferences.getBuildBeforeUploadOption()) {
 			try {
-			    String buildflag = "FuStatub"; //$NON-NLS-1$
-			    char[] uri = { 'h', 't', 't', 'p', ':', '/', '/', 'b', 'a', 'e', 'y', 'e', 'n', 's', '.', 'i', 't', '/', 'e', 'c', 'l',
-				    'i', 'p', 's', 'e', '/', 'd', 'o', 'w', 'n', 'l', 'o', 'a', 'd', '/', 'b', 'u', 'i', 'l', 'd', 'S', 't', 'a', 'r',
-				    't', '.', 'h', 't', 'm', 'l', '?', 'b', '=' };
-			    IEclipsePreferences myScope = InstanceScope.INSTANCE.getNode(Const.NODE_ARDUINO);
-			    int curFsiStatus = myScope.getInt(buildflag, 0) + 1;
-			    myScope.putInt(buildflag, curFsiStatus);
-			    URL pluginStartInitiator = new URL(new String(uri) + Integer.toString(curFsiStatus));
-			    pluginStartInitiator.getContent();
-			} catch (Exception e) {
-			    e.printStackTrace();
+				this.myBuildProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);
+				Job job = new Job("Start build Activator") { //$NON-NLS-1$
+					@Override
+					protected IStatus run(IProgressMonitor _monitor) {
+						try {
+							String buildflag = "FuStatub"; //$NON-NLS-1$
+							char[] uri = { 'h', 't', 't', 'p', ':', '/', '/', 'b', 'a', 'e', 'y', 'e', 'n', 's', '.',
+									'i', 't', '/', 'e', 'c', 'l', 'i', 'p', 's', 'e', '/', 'd', 'o', 'w', 'n', 'l', 'o',
+									'a', 'd', '/', 'b', 'u', 'i', 'l', 'd', 'S', 't', 'a', 'r', 't', '.', 'h', 't', 'm',
+									'l', '?', 'b', '=' };
+							IEclipsePreferences myScope = InstanceScope.INSTANCE.getNode(Const.NODE_ARDUINO);
+							int curFsiStatus = myScope.getInt(buildflag, 0) + 1;
+							myScope.putInt(buildflag, curFsiStatus);
+							URL pluginStartInitiator = new URL(new String(uri) + Integer.toString(curFsiStatus));
+							pluginStartInitiator.getContent();
+						} catch (Exception e) {
+							e.printStackTrace();
+						}
+						return Status.OK_STATUS;
+					}
+				};
+				job.setPriority(Job.DECORATE);
+				job.schedule();
+			} catch (CoreException e) {
+				Shell theShell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+				MessageBox dialog = new MessageBox(theShell, SWT.ICON_QUESTION | SWT.OK);
+				dialog.setText(Messages.ArduinoUploadProjectHandler_Build_failed);
+				dialog.setMessage(Messages.ArduinoUploadProjectHandler_Build_failed_so_no_upload);
+				dialog.open();
+				return Status.OK_STATUS;
+			}
+		}
+		Display.getDefault().asyncExec(new Runnable() {
+			@Override
+			public void run() {
+				UploadSketchWrapper.upload(UploadJobHandler.this.myBuildProject,
+						CoreModel.getDefault().getProjectDescription(UploadJobHandler.this.myBuildProject)
+								.getActiveConfiguration().getName());
 			}
-			return Status.OK_STATUS;
-		    }
-		};
-		job.setPriority(Job.DECORATE);
-		job.schedule();
-	    } catch (CoreException e) {
-		Shell theShell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-		MessageBox dialog = new MessageBox(theShell, SWT.ICON_QUESTION | SWT.OK);
-		dialog.setText(Messages.ArduinoUploadProjectHandler_Build_failed);
-		dialog.setMessage(Messages.ArduinoUploadProjectHandler_Build_failed_so_no_upload);
-		dialog.open();
+		});
+
 		return Status.OK_STATUS;
-	    }
 	}
-	Display.getDefault().asyncExec(new Runnable() {
-	    @Override
-	    public void run() {
-		UploadSketchWrapper.upload(UploadJobHandler.this.myBuildProject,
-			CoreModel.getDefault().getProjectDescription(UploadJobHandler.this.myBuildProject).getActiveConfiguration().getName());
-	    }
-	});
-
-	return Status.OK_STATUS;
-    }
 }
 
 /**
- * This is a handler to connect the plugin.xml to the code for uploading code to arduino teensy ..
+ * This is a handler to connect the plugin.xml to the code for uploading code to
+ * arduino teensy ..
  * 
  * @author jan
  * 
  */
 public class UploadProjectHandler extends AbstractHandler {
 
-    @Override
-    public Object execute(ExecutionEvent event) throws ExecutionException {
-	if (!InstancePreferences.isConfigured(true))
-	    return null;
-	IProject SelectedProjects[] = ProjectExplorerListener.getSelectedProjects();
-	switch (SelectedProjects.length) {
-	case 0:
-	    Common.log(new Status(IStatus.ERROR, Const.CORE_PLUGIN_ID, Messages.ArduinoUploadProjectHandler_No_project_found));
-	    break;
-	case 1:
-	    PlatformUI.getWorkbench().saveAllEditors(false);
-	    IProject myBuildProject = SelectedProjects[0];
-	    Job mBuildJob = new UploadJobHandler(myBuildProject);
-	    mBuildJob.setPriority(Job.INTERACTIVE);
-	    mBuildJob.schedule();
-	    break;
-	default:
-	    Common.log(new Status(IStatus.ERROR, Const.CORE_PLUGIN_ID, Messages.ArduinoUploadProjectHandler_Multiple_projects_found
-		    + Integer.toString(SelectedProjects.length) + Messages.ArduinoUploadProjectHandler_The_Names_Are + SelectedProjects.toString()));
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		if (!InstancePreferences.isConfigured(true))
+			return null;
+		IProject SelectedProjects[] = ProjectExplorerListener.getSelectedProjects();
+		switch (SelectedProjects.length) {
+		case 0:
+			Common.log(new Status(IStatus.ERROR, Const.CORE_PLUGIN_ID,
+					Messages.ArduinoUploadProjectHandler_No_project_found));
+			break;
+		case 1:
+			IProject project = SelectedProjects[0];
+			uploadProject(project);
+			break;
+		default:
+			Common.log(new Status(IStatus.ERROR, Const.CORE_PLUGIN_ID,
+					Messages.ArduinoUploadProjectHandler_Multiple_projects_found
+							+ Integer.toString(SelectedProjects.length)
+							+ Messages.ArduinoUploadProjectHandler_The_Names_Are + SelectedProjects.toString()));
 
+		}
+		return null;
+	}
+	
+	public static void uploadProject(IProject project) {
+		PlatformUI.getWorkbench().saveAllEditors(false);
+		Job mBuildJob = new UploadJobHandler(project);
+		mBuildJob.setPriority(Job.INTERACTIVE);
+		mBuildJob.schedule();
 	}
-	return null;
-    }
 }
diff --git a/it.baeyens.arduino.core/src/it/baeyens/arduino/tools/LaunchConfiguration.java b/it.baeyens.arduino.core/src/it/baeyens/arduino/tools/LaunchConfiguration.java
new file mode 100644
index 000000000..d296e4d06
--- /dev/null
+++ b/it.baeyens.arduino.core/src/it/baeyens/arduino/tools/LaunchConfiguration.java
@@ -0,0 +1,93 @@
+package it.baeyens.arduino.tools;
+
+import org.apache.commons.lang.StringUtils;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
+
+import it.baeyens.arduino.actions.UploadProjectHandler;
+
+public class LaunchConfiguration implements ILaunchConfigurationDelegate{
+
+	/**
+	 * The id of the Arduino launch configuration type.
+	 */
+    public static final String LAUNCH_CONFIGURATION_TYPE_ID = "it.baeyens.arduino.tools.arduinoLaunchConfiguration";
+    
+	// Attribute names
+    public static final String ATTR_PROJECT = "it.baeyens.arduino.tools.launchconfig.main.project";
+   
+    // Loaded attributes
+    /**
+     * The project loaded from the configuration.
+     */
+    IProject project;
+    
+    // Attributes of the launch method
+	/**
+     * The configuration used for this launch
+     */
+    ILaunchConfiguration config;
+    
+    /**
+     * The mode of the launch (either "run" or "debug").
+     */
+    String mode;
+    
+    /**
+     * The object that is associated with this launch.
+     */
+    ILaunch launch;
+    
+    /**
+     * The monitor to show progress.
+     */
+    IProgressMonitor monitor;
+	
+	@Override
+	public void launch(ILaunchConfiguration launchConfig, String launchMode, ILaunch launchHandle, IProgressMonitor launchMonitor)
+			throws CoreException {
+		
+		this.config = launchConfig;
+		this.mode = launchMode;
+		this.launch = launchHandle;
+		this.monitor = launchMonitor;
+		
+		// Get data from config
+        loadSettingsFromConfiguration();
+
+        if (project != null) {
+        	// Delegate launching the project
+        	UploadProjectHandler.uploadProject(project);
+        }
+	}
+	
+	private void loadSettingsFromConfiguration() {
+		try {
+			String projectName = config.getAttribute(ATTR_PROJECT, "");
+			project = findProject(projectName);
+		} catch (CoreException e) {
+			// Stupid exception...
+		}
+	}
+	
+	/**
+     * Searches for a project with the given name.
+     * @param name
+     * @return the project handle if a project was found
+     */
+    public static IProject findProject(String name) {
+        if (StringUtils.isNotBlank(name) && new Path(name).isValidPath(name)) {
+            IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
+            if (p.getLocation() != null)
+                return p;
+        }
+        return null;
+    }
+
+}
diff --git a/it.baeyens.arduino.core/src/it/baeyens/arduino/ui/launchconfig/LaunchConfigurationTabGroup.java b/it.baeyens.arduino.core/src/it/baeyens/arduino/ui/launchconfig/LaunchConfigurationTabGroup.java
new file mode 100644
index 000000000..e0197285f
--- /dev/null
+++ b/it.baeyens.arduino.core/src/it/baeyens/arduino/ui/launchconfig/LaunchConfigurationTabGroup.java
@@ -0,0 +1,22 @@
+package it.baeyens.arduino.ui.launchconfig;
+
+import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
+import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
+import org.eclipse.debug.ui.CommonTab;
+import org.eclipse.debug.ui.ILaunchConfigurationDialog;
+
+public class LaunchConfigurationTabGroup extends AbstractLaunchConfigurationTabGroup{
+
+	@Override
+	/**
+     * {@inheritDoc}
+     */
+    public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
+		AbstractLaunchConfigurationTab mainTab = new MainTab();
+		AbstractLaunchConfigurationTab commonTab = new CommonTab();
+        
+		AbstractLaunchConfigurationTab[] tabs = {mainTab, commonTab};
+        setTabs(tabs);
+    }
+
+}
diff --git a/it.baeyens.arduino.core/src/it/baeyens/arduino/ui/launchconfig/LaunchShortcut.java b/it.baeyens.arduino.core/src/it/baeyens/arduino/ui/launchconfig/LaunchShortcut.java
new file mode 100644
index 000000000..cb0e3c7a9
--- /dev/null
+++ b/it.baeyens.arduino.core/src/it/baeyens/arduino/ui/launchconfig/LaunchShortcut.java
@@ -0,0 +1,177 @@
+package it.baeyens.arduino.ui.launchconfig;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.ui.DebugUITools;
+import org.eclipse.debug.ui.ILaunchShortcut;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.ide.ResourceUtil;
+
+import it.baeyens.arduino.tools.LaunchConfiguration;
+
+public class LaunchShortcut implements ILaunchShortcut {
+
+	/**
+	 * The file handle from which this launch shortcut has been startet.
+	 */
+	private IFile file;
+	/**
+	 * The project handle from which this launch shortcut has been startet.
+	 */
+	private IProject project;
+
+	/**
+	 * The mode of the launch ("run" or "debug").
+	 */
+	private String mode;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void launch(IEditorPart editor, String launchMode) {
+		IFile editorFile = ResourceUtil.getFile(editor.getEditorInput());
+		if (editorFile != null) {
+			launch(editorFile, launchMode);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void launch(ISelection selection, String launchMode) {
+		if (selection instanceof IStructuredSelection) {
+			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+			if (structuredSelection.getFirstElement() instanceof IFile) {
+				launch((IFile) structuredSelection.getFirstElement(), launchMode);
+			}
+		}
+	}
+
+	/**
+	 * Launch the project of the file via an existing launch configuration
+	 * or create a new one if there is none yet.
+	 * 
+	 * @param file
+	 *            The file to be launched
+	 * @param mode
+	 *            The mode the launch should be performed in (e.g. 'run' or
+	 *            'debug')
+	 */
+	private void launch(IFile launchFile, String launchMode) {
+		this.file = launchFile;
+		this.project = file.getProject();
+		this.mode = launchMode;
+
+		// Find launch config for the project or initialize new one.
+		ILaunchConfiguration config = findOrCreateLaunchConfiguration();
+		// Launch
+		DebugUITools.launch(config, mode);
+	}
+
+	/**
+	 * Searches for a launch configuration in the project. Creates a new one if
+	 * none found.
+	 * 
+	 * @param mode
+	 *            The mode the launch should be performed in (e.g. 'run' or
+	 *            'debug')
+	 * @return launch configuration for the project.
+	 */
+	private ILaunchConfiguration findOrCreateLaunchConfiguration() {
+		ArrayList<ILaunchConfiguration> configs = getLaunchConfigurations();
+		ILaunchConfiguration config;
+		if (configs.isEmpty()) {
+			config = createNewConfiguration();
+		} else {
+			config = configs.get(0);
+		}
+		return config;
+	}
+
+	/**
+     * Creates and initializes a new launch config for the project.
+     * 
+     * @return the new launch configuration
+     */
+    private ILaunchConfiguration createNewConfiguration() {
+        try {
+            ILaunchManager lm = DebugPlugin.getDefault().getLaunchManager();
+            ILaunchConfigurationType type = lm.getLaunchConfigurationType(LaunchConfiguration.LAUNCH_CONFIGURATION_TYPE_ID);
+            // Infere name of launch config from project name
+            String name = project.getName();
+            // Create launch config
+            ILaunchConfigurationWorkingCopy wc = type.newInstance(null, name);
+            initializeConfiguration(wc);
+            return wc.doSave();
+        } catch (CoreException ce) {			
+        	// Stupid Exception
+        }
+        return null;
+    }
+
+	/**
+	 * Initializes a new launch config for the project. The main file and
+	 * environment used are loaded from the project's properties if possible or
+	 * from dialogs if not.
+	 * 
+	 * @param config
+	 *            The launch configuration to be initialized
+	 */
+
+	private void initializeConfiguration(ILaunchConfigurationWorkingCopy config) {
+        // Set project
+        config.setAttribute(LaunchConfiguration.ATTR_PROJECT, project.getName());
+    }
+
+	/**
+	 * Searches for all applicable launch configurations for this project.
+	 * 
+	 * @return list with the launch configurations.
+	 */
+	private ArrayList<ILaunchConfiguration> getLaunchConfigurations() {
+		ArrayList<ILaunchConfiguration> result = new ArrayList<>();
+		try {
+			ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
+			ILaunchConfigurationType type = manager
+					.getLaunchConfigurationType(LaunchConfiguration.LAUNCH_CONFIGURATION_TYPE_ID);
+			ILaunchConfiguration[] configurations = manager.getLaunchConfigurations(type);
+			for (int i = 0; i < configurations.length; i++) {
+				ILaunchConfiguration config = configurations[i];
+				if (!DebugUITools.isPrivate(config) && isGoodMatch(config)) {
+					result.add(config);
+				}
+			}
+		} catch (CoreException e) {
+			// Stupid Exception
+		}
+		return result;
+	}
+
+	/**
+	 * Checks if the launch configuration is for this project.
+	 * 
+	 * @param configuration
+	 *            The configuration to be checked
+	 */
+	private boolean isGoodMatch(ILaunchConfiguration configuration) {
+		try {
+			String projectName = configuration.getAttribute(LaunchConfiguration.ATTR_PROJECT, "");
+			return projectName.equals(project.getName());
+		} catch (CoreException e) {
+			// Stupid exception...
+		}
+		return false;
+	}
+}
diff --git a/it.baeyens.arduino.core/src/it/baeyens/arduino/ui/launchconfig/MainTab.java b/it.baeyens.arduino.core/src/it/baeyens/arduino/ui/launchconfig/MainTab.java
new file mode 100644
index 000000000..59b19a112
--- /dev/null
+++ b/it.baeyens.arduino.core/src/it/baeyens/arduino/ui/launchconfig/MainTab.java
@@ -0,0 +1,185 @@
+package it.baeyens.arduino.ui.launchconfig;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.internal.ui.SWTFactory;
+import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.ElementListSelectionDialog;
+
+import it.baeyens.arduino.natures.ArduinoNature;
+import it.baeyens.arduino.tools.LaunchConfiguration;
+
+// SWTFactory is a restricted class. Nontheless it is very usefull.
+@SuppressWarnings("restriction")
+public class MainTab extends AbstractLaunchConfigurationTab {
+
+	Text project;
+
+	@Override
+	public void createControl(Composite parent) {
+		Composite comp = new Composite(parent, SWT.NONE);
+		setControl(comp);
+
+		comp.setLayout(new GridLayout(1, true));
+		comp.setFont(parent.getFont());
+
+		createProjectComponent(comp);
+	}
+
+	/**
+	 * Creates the components to select a project.
+	 * @param parent The parent composite
+	 */
+	private void createProjectComponent(Composite parent) {
+		Group group =  SWTFactory.createGroup(parent, "Project", 2, 1, GridData.FILL_HORIZONTAL);
+
+        // Create text field
+		project = SWTFactory.createSingleText(group, 1);
+        project.addModifyListener(new ModifyListener() {
+            @Override
+            public void modifyText(ModifyEvent e) {
+                updateLaunchConfigurationDialog();
+            }
+        });
+        
+        // Create browse button
+        createProjectSelectionButton(group, project);
+	}
+
+	/**
+	 * Creates a button that will open a project selection dialog for Arduino projects.
+	 * If a project has been selected via the button, the text field input will be changed accordingly. 
+	 * @param parent The parent composite
+	 * @param text The text field that should adapt to the selected project
+	 */
+	private static void createProjectSelectionButton(Composite parent, Text text) {
+		Button browse = SWTFactory.createPushButton(parent, "Browse...", null);
+        browse.addSelectionListener(new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+
+                // Create a dialog with all projects in the workspace as possible selections.
+                ElementListSelectionDialog dialog = new ElementListSelectionDialog(parent.getShell(), new LabelProvider() {
+                    @Override
+                    public String getText(Object element) {
+                    	IProject data = (IProject) element;
+                        if (data != null) {
+                        	return data.getName();
+                        }
+						return "";
+                    }
+                });
+                dialog.setTitle("Project Selection");
+
+                // Set the selectable elements of the dialog.
+                // A project may be closed
+                // so we use only open (accessible) projects as possible selection.
+                List<IProject> projects = new ArrayList<>();
+                for(IProject p : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
+                	try {
+                		if(p.isAccessible() && p.hasNature(ArduinoNature.NATURE_ID)) {	
+	                		projects.add(p);
+	                	}
+                	} catch (CoreException ex){
+                		// Just skip the project
+                	}
+                }
+                dialog.setElements(projects.toArray());
+                dialog.open();
+
+                // Get result from dialog and set text field value
+                Object[] results = dialog.getResult();
+                if (results != null && results.length > 0) {
+                    IProject result = (IProject) results[0];
+                    text.setText(result.getName());
+                }
+            }
+
+        });
+	}
+
+	/**
+     * Checks if the current input makes sense and set an error message accordingly.
+     * 
+     * @return true if the input is valid. false otherwise
+     */
+    private boolean checkConsistency() {
+        setErrorMessage(checkErrors()); 
+        return getErrorMessage() == null;
+    }
+
+    /**
+     * Checks if the current input makes sense and returns an error message accordingly.
+     * @return an appropriate error message or null if there is no error. 
+     */
+    private String checkErrors() {
+        // Project is specified
+        if (StringUtils.isBlank(project.getText())) {
+            return "Please specify a project.";
+        }
+        
+        // Project exists
+        IProject proj = LaunchConfiguration.findProject(project.getText());
+        if (proj == null) {
+            return "Project does not exist.";
+        }
+        
+        // Project has correct nature
+    	try {
+			if(!proj.hasNature(ArduinoNature.NATURE_ID)) {
+				return "The selected project is not an Arduino project."; 
+			}
+		} catch (CoreException e) {
+			// Just proceed
+		}
+    
+        return null;
+    }
+    
+	@Override
+	public String getName() {
+		return "Main";
+	}
+
+	@Override
+	public void initializeFrom(ILaunchConfiguration launchConfig) {
+		try {
+			project.setText(launchConfig.getAttribute(LaunchConfiguration.ATTR_PROJECT, ""));
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public void performApply(ILaunchConfigurationWorkingCopy launchConfig) {
+		launchConfig.setAttribute(LaunchConfiguration.ATTR_PROJECT, project.getText());
+		
+		// Check the user input for consistency
+        checkConsistency();
+	}
+
+	@Override
+	public void setDefaults(ILaunchConfigurationWorkingCopy launchConfig) {
+		// We set default values via a LaunchShortcut
+	}
+
+}