Modern syntax, woooooohooooo.
Merge pull request #26 from MattFoley/master

Modern Syntax.