Fixed GitHub Issue #13