Issue 77

Fix #77