daliborjanak Merge pull request #6 from Mapotempo/oneway