minor improvments
Merge remote-tracking branch 'nikkis/master'