commit devel_2
Merge pull request #1 from danielurdas/devel_2

commit devel_2