Merge pull request #81 from fadler/fadler_dev

Merge pull request #79 from fadler/master
Merge remote-tracking branch 'origin/master' into vadler_dev