Feature plus closes #2