more changes
Merge branch 'master' of https://github.com/vredchenko/marviq-dday-062013