Revised for integration

Revision:
7:06baa3e5382d
Parent:
4:22c5c4aa4661