Rebase of AngelEmu

Merging current project with a rebased project.