merging dev to master
fixed tagline