s
merged
Merge pull request #40 from mendyismyname/master

merge fix