#39

Issue 5:
Fixed