Added initial extended support for shot suggestion system
Merge branch 'master' of https://github.com/tripples/spm