More typesafety
Fix copyright year
Merge pull request #1 from samoht/master

More typesafety