Made changes
Fixes issues mentioned by Brent in pull request #1.
Merge pull request #1 from brentjanderson/dev

Let's make these changes