Issue 773

Fixes #773 

Please read commit logs for details on this update.