Applying changes referenced in #14