Merging
bug fix
Pass on all tests