Merge pull request #14 from thaives/master

My feature