Merge pull request #34 from wlanslovenija/master