miker2049 Merge pull request #20 from miker2049/apc_dev