added OriginalFormat.PSASP and updated code accordingly
Merge remote-tracking branch 'origin/master'