paleolimbot Merge pull request #6 from jsta/master