Fix order + Add sampajs v3.1 by @suissa