fixd
Merge pull request #5 from madbearz/master

fixd