Solution voor enhancement issue #50.
Solution for bug issue #49.
More problem solving for issue #50
Solved issue #46
Solved issue #45
Final problem solving for issue #50