static almost done
Merge pull request #3 from MirtlBu/master

static almost done