Merge pull request #66 from robdaemon/ataritos