bring in sync with infra_test
Merge pull request #22 from maratoid/master

bring in sync with infra_test