fine toning
Merge remote-tracking branch 'aschin/master'
merged with adam