Update some things
Merge pull request #27 from StickmanVentures/update

Update some things