got it all working
Merge pull request #27 from GilUpstream/issue26

got it all working