Included modifications by TealVince (http://www.soliforum.com/post/13074/#p13074)