First commit from Learnlocity! -- modified