Fixing #18 ) in progress