verion udpated
Merge branch 'working'