Fixed issue #26.  Should probably write further tests for this.
Fixed issue #26.  Should probably write further tests for this.

GoUbiq/pyexchange,pusnik/pyexchange,gluru/pyexchange,linkedin/pyexchange,gluru/pyexchange,moha24/pyexchange