Patch 5

closes #15