Finished bug fixing in qa branch, calling it version 1.1.1