Merge pull request #3 from gberton/master

epitaph
thruthseeker