Issue 5 resolved