Merge pull request #78 from mpeuster/master

Improved test to be skipped when executed within a container.