Added IP address capability
Added TOKEN configuration parameter
Annotations update
Merge pull request #286 from maksimov/develop

Develop