Issue 115

closes issue_115