Issue 379

@fjarrett Please test and review