Issue 21 resolved