Merge pull request #155 from regru/master

Up to DATE
Now with its own name