finalised ACP for 1.3
Merge pull request #78 from Sajaki/dev

finalised ACP for 1.3