Alien4

Finally merged Alien branch to Development.