merge with Patrik Luoto changes (title page and abstract)