big jump from 1.2.1 to 2.0
Merge pull request #87 from gerritvanaaken/temp_migration

big jump from 1.2.1 to 2.0