Hotfix - reusing ACS token.
Minor cleanup changes.
Merge pull request #48 from ivan-shaporov/dev

Hotfix - reusing ACS token.