whatever
merge #14 whatever (sstok)

This PR was submitted for the master branch but it was squashed and merged into the master-new branch instead (closes #14).

Discussion
----------

Commits
-------

355a674c1d87514e1a823f71710b1e1f7e26a9da whatever (sstok)