Merge pull request #2 from dariogriffo/develop

Bug fixing, versioning
Adding version file