Updates to newer syntax
Merge pull request #3 from joehakimrahme/master

Updates to newer syntax