Merge pull request #40 from maksimov/2014.03

2014.03
Merge pull request #42 from maksimov/2014.03

Fixes for image and static ip tests