Merge pull request #27 from SuperJugy/test

Make use of strongly typed variables and stop using deprecated properties