fork for https://code.google.com/p/osmbonuspack/