Issue 100

Fix #100