merging sorcery_gem branch to master