stable code
Merge pull request #5 from scaperoth/master

stable code