Merging changes from acthomas06/qazar to fijiaaron/qazar master branch