merge development into master
update readme