popox/ShotHere — pull request #8 by popox (2013-07-25 13:38:30+00:00)
Title: This branch has conflict with master branch

Merge has to be done