Merge pull request #112 from tomvantilburg/master

merge from Tom
Fixed issue where record.id() should give back string 'always'
Merge branch 'master' of https://github.com/Geodan/cow
Merge pull request #25 from Geodan/master

merge from origin