Merge conflicts of #3

This is #3 with the conflicts solved.