Fork for fixes

Revision:
22:a0b1d0e6d237
Parent:
9:a156d3de5647