Merge pull request #25 from hellyeah/master