Fixes #36.

Stable Version 0.7.1