Added files from acal gitorious repo