Merge pull request #1 from MicheleSr/master

Replaced hardcoded identification of password position with dynamic code