Merge pull request #78 from fadler/fadler_dev

Fadler dev
Merge remote-tracking branch 'origin/vadler_dev'