dev
Merge pull request #3 from szymku/todev

dev