Issue 109

Fix #109