Merged changes since pull request #5