Lang -> Master Pull Request

Again, it's come to the point where I feel that the lang branch has served its purpose and is ready to be merged with the master branch.