updating problems
refactor
Merge branch 'master' into haskell