Adding more options for training

Also added some overloaded functions
Merge branch 'master' of https://github.com/a-hart/Beacon