Issue7

Fix Issue #7