0.6.6.1 compatible
Merge pull request #2 from mcevskb/patch-1

0.6.6.1 compatible