Fix #85
Merge branch 'master' of github.com:soapower/soapower