Merge pull request #2 from reqshark/master

git what
way cooler git what!