Resolving #172
Merge pull request #174 from rekino/master

A fix for bug #172