Preparations for v0.7.0
Simplify command construction thanks to @ckrailo