Small changes
Merge pull request #8 from bajh/frontend

Small changes