Merged and resolved / closed #5