V 1.0.0.0.3

Rick feedback #2