little modifications
Merge branch 'shoot'