Merge pull request #17 from mLuby/dev

Merged.
Testing works