MERGING changes made due to second alpha release

MERGING changes made due to second alpha release