Merge pull request #19 from Disoft/master

update to manfredo-branch