Merge Alpha Release to Master

Add all upgrades from initial alpha testing to the master repository.