Sync'd with 0.9.4