Merge pull request #498 from Maaack/add-input-hints