trying to fix error message...
Merge branch 'master' of https://github.com/codyorick/dan