Resolved merge conflicts for PRs #8-36

This is the combination of pull requests #8 through #36.