Pull request that resolves issue 11