cleaned up
error update
Fixed
Merge pull request #1 from Targun/develop

Develop