Improve usability (merge pull-request #226)