PTM & AC stuff
Merge branch 'refactor' of github.com:smealum/ctrulib into refactor