Changes as per Sam Gordon (segordon - github). Thanks.