Merge pull request #17 from scaperoth/master

z
minor adjustments
more minor
Merge pull request #14 from awp1121/master

merge logic from awp