dev

dev1
Merge pull request #2 from bromix/dev-1

dev
Merge pull request #3 from bromix/stable-1

Stable 1