Develop

Pull request to compare development progress from original master branch.