Merge pull request #1 from jedmund/master

Merge branch 'star'
Merge pull request #3 from jedmund/star

Merge pull request #1 from jedmund/master