[BF] Removing testing code
[BF] Wrong command execution
Merge branch 'master' into bf-various_bugfixes
Merge pull request #25 from opensolutions/bf-various_bugfixes

Various bugfixes