Merge pull request #3 from mhehm/master

Some Fixes
Merge pull request #1 from guilleva/master

Update