Cleaned up constructor and changed tests to reflect. Updated jar file version.