Nick

Just a request to merge with master, really just figureing this out. ignore if you wish