patches for story 65 and 72 from shinetech
Merge remote-tracking branch 'origin/release' into develop
current branch
current branch