Merge pull request #79 from fadler/master

merge
Merge pull request #81 from fadler/fadler_dev

Merge pull request #79 from fadler/master