merge pull request from lpernie- hodoscope
merge pull request from lpernie- hodoscope
merge pull request from lpernie- hodoscope
merge pull request from lpernie- hodoscope
merge pull request from lpernie- hodoscope
merge pull request from lpernie- hodoscope