Merge pull request #6 from phillwilt/master

Merge pull request #5 from phillwilt/frontend