Merged pull request 97
Fixed merge conflicts.