Converted to Java Beans
Merge origin/master