Merge pull request #306 from robwilkens/master