merged pull request 'patch-1' and made a few updates