Added more features, upgraded to Wrapper 1.7 and enforced better formatting.