Merge pull request #27 from ferrix/master

Further automation