Added back type parameter, java 6 compatibility...
Added extended MarginInfo class with two boolean constructor