Resolving version (now 15) and whitespace issues