Merge pull request #1 from jedmund/master

Merge branch 'star'