Made changes requested by akonfink in regards to pull request