these were all issues raised in previous pull requests that needed to be resolved
Merge pull request #151 from avleen/fixing_pulls

these were all issues raised in previous pull requests that needed to be...