fix exception
exception
Merge branch 'develop' of https://github.com/rluders/rdstation