Added development version support