Merge pull request #46 from pitr-ch/master

Minor improvements and fixes
fix file name for auto-loading