Issue 140

Fix #140