Issue 54

Issue 80