Added temporary fix for parsing some of the response back.

TODO: Add complete and proper parsing
Cleaned up some redundant code
Merge branch 'bug/parsing-address-response' into develop
Bumped version number
Merge branch 'release/v2.1.1' into develop