Merge pull request #24 from Pushpalanka/master

Merging changes from pulasthi master
Adapting changed for POX security handler