updated documentation and removed a suspicious debug print statement
Merge branch 'release/0.4'