fixed some errors
merge conflict
Merge pull request #86 from scalableinternetservices/fixerrors

fixed some errors