Issue5

This closes #5 , and completes half of issue #86.