merged changes from Shmuma

merged changes from Shmuma