Some quick changes to master branch