Interface improvements
Merge pull request #467 from Debeet/master

Many interface improvements