Added additional constructor and more javadoc