Merge pull request #277 from pgreyson/master

First look