Added getters and setters to AlterOptions
Merge remote-tracking branch 'origin/develop' into develop