fixed #17 - implemented extended security