Closing issue #24. See it for additional info