More updates
Merge pull request #130 from dockyard/updates

More updates