Modifying "System" calls to "self".
Merge pull request #741 from shefik/topic_branches/system

Modifying "System" calls to "self".