Cleanup for Issue #25
Adding Issue #25
Merge branch 'issues/25'