Fork for fixes

Revision:
22:a0b1d0e6d237
Parent:
11:647d53d146f1