Merge pull request #2 from leaena/john

John merge!