phracek Merge pull request #264 from multi-arch/samples