Merge pull request #29 from ayshsandu/master

Refactoring+Improvements
Merge remote-tracking branch 'upstream/master'
Revert "added settimeouts for test cases"

This reverts commit 9a8c906bb4bbf60dda8b435bca3fa4f35ee73ecf.