Merge pull request #19 from Disoft/master

update to manfredo-branch
Merge pull request #22 from Disoft/Manfredo-Branch

Merge pull request #19 from Disoft/master