1.8.7 compatibility
Version 0.1.1