Pull requisite from Capri
Merge pull request #29 from Capri2014/newfeature

Pull requisite from Capri