Merge pull request #185 from adamarla/master

hints support
Merge pull request #186 from adamarla/master

Merge remote-tracking branch 'upstream/master'
Merge pull request #187 from adamarla/master

Included question Id
Merge pull request #188 from adamarla/master

question Id, not question
Merge remote-tracking branch 'upstream/master'