Fixes #1. Please take a look