Merge pull request #328 from chris5560/master-pending-1