Closes Issue #5, + update of some natives.