Merge pull request #95 from wlanslovenija/master