Merge pull request #87 from dildick/master

Bugfixe + pile-up label
clean-up
Merge remote-tracking branch 'origin/master'