Merge pull request #1 from gidden/master

outline