adding missing changes
Merge branch 'research'
Merge pull request #150 from matfed/master

adding missing changes