Merged Master Branch 12-09-2014