improvements
found bug
Merge remote-tracking branch 'origin/issue13' into issue13