Moved 'dev' to 'master'

Move code in 'dev' branch to 'master' branch