TST-1 c
Merge pull request #11 from mstencel/pr1-branch

Pr1 branch