Merge pull 33: android compatibility fix