Moved final changes into public repository