Merge pull request #2 from scaperoth/master

merging
Merge pull request #3 from scaperoth/mscapero

Merge pull request #2 from scaperoth/master