Merge pull request #27 from martme/haakon

Haakon
abstract, started
abstract and acknowledgment