Merge pull request #13