Added hinting. Close #2