I've improved the macro! I'll be re-uploading once it's ready for use!