Gregory Bond - 2016-11-03

See Patch #13 which should fix this issue.