Feature support

closes #21