Merge pull request #8 from ljubar/master

Had to revert due to conflict in layout.tpl