Merge pull request #19 from rigorighetti/master

Hotfix to VTP
Little changes to prepare to LDAP auth