Merge pull request #1 from potfur/dev

v1.0
renamed