Merge tag '1.0.2' into develop

Improved overrideability of adjust()
Added pre and post_adjust methods
Bumped version number
Merge branch 'release/1.0.3'