Feature spec

Closes #35
Merge master and pull request