Changed piece set into something a bit less shitty, old file stays to allow possible changing in the future
Merge branch 'master' into gh-pages