Better way handling security token http://bit.ly/13Kkj6K and http://bit.ly/1a4CMen
Merge branch 'secret_token'