Importedt files from source code of version 0.5.3