0.1.5 Proper APR

Manual merge of changes by divisionbyzero1