Merge pull request #1 from samaaron/master

catch up