adding generic functionality
working on handler
Merging release into master.