foo
merge #2 My (tmilos)

This PR was squashed before being merged into the master branch (closes #2).

Discussion
----------

Commits
-------

43caa0aa9235f1f1b8c16177cf6db402afdca7c4 foo