Merge branch 'master' of github.com:nuttycom/aftok

Created by  Kris Nuttycombe  on March 5, 2016
HOKV4NKRX7FFDNVU7K63EFVUE3NVP5O7NMESCJEBRND5H7XXPS5AC
Change contents