Merge pull request #2 from mmz-srf/v0.3

Only to enable travis building in master...
Merge remote-tracking branch 'origin/master' into v0.3