Merge pull request #2 from RyanChenLee/master

Pull your stuff into my fork maybe?