hints support
Merge pull request #185 from adamarla/master

hints support