Merge pull request #1 from aaronr/master

Merging from Master