Adding initial version
Small updates
Make it easy to go headless