Merged master changes #423