Fixed issues with pull request 3 merge.