Merge "Add ability to automatically bootup"