Use autoload functionallity & correct default calc_comment
Merge pull request #3 from mMontu/master

Use autoload functionallity & correct default calc_comment