Pushed fixes from last commit; accidentally checkout-ed master which erased the fixes
Merge pull request #366 from iameric1986/master

Pushed fixes from last commit; accidentally checkout-ed master which era...