Added parameter handlers
Merge branch 'master' of https://github.com/BobertForever/bwi