Pull request/9f65a9f8

Try #2 for initial merge. The other versions have been deleted.