merging "dev" branch fixes