Fixes Issues #14