Merged changes from master and re-built