Issue636

No framework changes, one minor framework criticism... But I thought I'd try this pull request thing anyways, just to see how it works.