Issue 212

Including tests