Merged Changes from timmolter/Develop branch