Updated

Should be okay now
Merge pull request #87 from mikeradino/master

Updated