Resync 

Resyncing with coderifous branch