Merges pull requests 32 and 33

This pull request places the contents of PR #32 on top of those in PR #33.