Author
Merge pull request #16 from pkurowski/dev2

Author