#172 Fixed code not working
Merge pull request #173 from pquerner/FIX/172

#172 Fixed code not working