my own branch
Merge pull request #1 from HackerPartie/jens_little_box

my own branch