Started work on issue #16. Note: there is an unusual speed problem that needs to be resolved, so code is temporarily commented out.