Issue 18 resolved