diff --git a/HelloWorld/src/HelloUser.java b/HelloWorld/src/HelloUser.java
new file mode 100644
index 0000000..e2291ae
--- /dev/null
+++ b/HelloWorld/src/HelloUser.java
@@ -0,0 +1,21 @@
+
+
+public class HelloUser 
+{	
+	
+	private String username;
+	
+	
+	public HelloUser(String name) 
+	{
+		username = name;
+	}
+	
+	public void greetUser()
+	{
+	System.out.println("Hello "+username+" !");
+	}
+	
+}
+
+
diff --git a/HelloWorld/src/HelloWorld.java b/HelloWorld/src/HelloWorld.java
index db5693d..aab3034 100755
--- a/HelloWorld/src/HelloWorld.java
+++ b/HelloWorld/src/HelloWorld.java
@@ -1,18 +1,23 @@
-/**
- * 
- */
 
-/**
- * @author Mohsen
- *
- */
-public class HelloWorld {
+import java.util.*;
 
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
+
+public class HelloWorld 
+{
+
+	public static void main(String[] args) 
+	{
+		Scanner s = new Scanner(System.in);
+		
 		System.out.println("Hello ASE2016 - how are you? :)");
+		System.out.println("Please enter your name: ");
+		String name = s.next();
+		
+		HelloUser user = new HelloUser(name);
+		user.greetUser();
+		s.close();	
+		
+		
 	}
 
 }