Issue 16 resolved