Fork for fixes

Revision:
22:a0b1d0e6d237
Parent:
16:269f652b4d0b