Sync with original

Syncronize again with Osman's original repository.