Updated to version 1.1. Added JUnit tests