Updated to latest versions and updated style#18

jasonsperske wants to merge 1 commit into

tholander:mastertholander/optionable:masterfrom

jasonsperske:masterjasonsperske/optionable:masterCopy head branch name to clipboard