Initial work for SniperMonkey addition
Merge branch 'dev'