some changes
Merge branch 'nick'