Closes #98 and provides beginnings of #13
Merge pull request #99 from jpav/master

Closes #98 and provides beginnings of #13