Issue #71: Changed variable names and added setters & getters.