Merge of latest from turltedev and master branches
version bump