Merge pull request from brainless/develop Minor code cleanup; dependency updates