More changes
Merge pull request #12 from mhansbury/master

More changes