Related partially to #66 raised issue
Related partially to #66 raised issue