added some more functionality
Merge branch 'master' of https://github.com/samjhill/6g1w