Shuriken
Shuriken :-1:
Merge remote-tracking branch 'origin/master' into Shuriken
Shuriken :-1:
Basic Shuriken :+1:
Fixed a warning
Merge with master
Merge conflicts with master