Merging from #127

This is from merge request #127 from Barry