Fixed #41
merge