Rev099

Amended issue #10, #7. Both features added.