Bugfix and enhancements (hopefully)
 * Configi
Merge pull request #9 from didona/master

Squashed commit of the following: