merged changes from master branch
fixed some stuff