Merge pull request #6 from Syke94/master

Operator madness & QoL