Issue 107

Fix  #107