Refs #43 Some Changes