Merging changes from PhantomYdn repository