sync with current version of website
Merge pull request #8 from liucijus/master

sync with current version of website