Adding files from APT
Merge github.com:dchinmaya/APT2013