Issue #11

Fix #11