gsuess Merge pull request #170 from jimmiebtlr/master