Merge pull request #2 from charugvvdn/restructuring

error handling
error handling
Merge branch 'master' of https://github.com/charugvvdn/Meru into restructuring