small test added, pre merge commit
Merge remote-tracking branch 'origin/master'
fixed small issues. everything seems to work.