Version 1.4

Add comments and JUnit Test