Iss15

Issue #15 complete. Pull into master branch.