Added "autostart" option
Merge branch 'release/0.2'