front-end work
Merge pull request #37 from louridas/master

front-end work