Merge pull request #1 from vindico/master

Small fixes and updates
Version number bump.