Issue 377

@nevet 
Should be ok to merge.