Issue916

This branch attempts to resolve issue 916.