error fixes
Merge pull request #14 from 3ashtag/requests

error fixes