Issue #11 pull request

Solves #11.