Commits in fp1/functionalprogramming1:master