Fixed build
Merged changes from master.