More updates

Signed-off-by: David Scott <dave.scott@citrix.com>
Merge pull request #7 from djs55/update

More updates