andyrichardson Merge pull request #17 from andyrichardson/support-43