Added vagrant support and png support