Issue 55 and 57 fixed