1-5 BugFix 1 is done !
1-5 BugFix 1
1-5 BugFix 1 Organize imports
Add some JUnit tests