Initial bottle support
Fix failing py33 test