Iss 14

This resolves Issue #14