brson Merge pull request #4 from s3bk/master …