updates / changes

from master to dev