GENERAL - little improvements
Merge remote-tracking branch 'bristleback/bristleback-0.3.0-dev' into bristleback-0.3.0-dev