Merged feature hangman into master