Issue 30 FULL

Issue 30 FULL