Spass merge into master