1.8 only
Merge pull request #4 from ablohowiak-fanhattan/patch-1

1.8 only