commit by ajyli
Merge pull request #2 from enson/master

tip bugfix