Merge pull request #283 from aliaspider/master