Merge pull request #127 from pallih/master

Sitrep 180