edit bug
merge bug
commit dev
commit master and dev