FUCK YOUR MERGE CONFLICTS RUBY
FUCK YOUR MERGE CONFLICTS RUBY
Merge pull request #378 from iameric1986/master

Fixed merge conflicts