Merge snapjs to master