Merge pull request #87 from yupe/master

UPD: merge with yupe/master
UPD: add APC options to docs
Merge pull request #938 from angel-kulikov/master

UPD: add APC options to docs