Updated extension methods, fixes #14.