Merge pull request #2 from olton/master

Master