Release 1.0.5 - Ready for Maven
merged with be3130e3f18daf2a15e111d003e4a85ddb4826ed