Voting

@AlexSYanai - Here it is. Had a freaking wierd merge conflict where the branch conflicted with it's own remote version, so double-check that it runs on your own machine before merging?