Merge pull request #1 from nyamsprod/master

adding preparation for unit testing
Merge pull request #2 from nyamsprod/dev

Merge pull request #1 from nyamsprod/master