Completed feature-keySet. closes #10