V201409 update

Please review and test.
Good catch! Thanks!