Sync with master 0.1.9