Merge pull request #258 from tuxcanfly/master