Commit Bob's amendment

@2014-12-22 16:06:27