Final tweaks for 0.9.5
Merge pull request #39 from jandudek/final-tweaks-095

Final tweaks for 0.9.5