Front end update
Merge pull request #5 from vctrx/master

Front end update