Merge with Neonunux repository last commit