Merge pull request #8 from slide/master

Update core dependency, implement private tokens and safe expansion
Fix missing method override and fix test for windows