Issue 52

Fix #52