first try to solve ticket 137
first try to solve ticket 137, take2
Merge pull request #154 from gioman/master

First try to solve ticket 137