Merges pull requests 32 and 33

This pull request places PR32 on top of PR33.