refactored, added conway-wechsler method, fixed #1
tests added