Merge pull request #192 from adamarla/master

hash by subpart id for hints
Merge pull request #193 from adamarla/master

used keyword by mistake
Merge remote-tracking branch 'upstream/master'