* Merged latest code from the master branch.
* Moved memory.c into the "src" folder.