Fixed Python 3.3 testing
Fixed Python 3.3 testing
Renamed class KeyStore
Renamed name token all