Was calling a wrong function.
Merge branch 'master' into vjeko
Merge pull request #2 from NetSys/vjeko

Vjeko