Issue47

Fix #47