Merge from frank

Hi! Hope this merges properly and that it is the right thing and everything.