Merge pull request #1 from andburch/master

pulll