Merge pull request #10 from tcpcloud/keystone_fix

Keystone fix