Fixed issue #8.
Started working on issue #11.