Merge pull request #5 from luster/joe

Joe