Issue25

Fix #25