Merge pull request #177 from gitMbar/dev

Add iffys to prevent access to scope
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev