bjornmp Merge pull request #2 from panzergame/master