Matpardo merge with masterIssue 29

Merging Changes
Related to Issue #29