Avoid NoneType iteration exception
Merge branch 'master' of github.com:rmcauley/rainwave