Issue5

Fix #5