Created some basic functions like getters and setters for basic classes
Merge origin/master