Merge branch 'master' of github.com:pageandrew/whistle-parser