Merged changes from other machines

now tests for hostname