Issue/95

Fix #95