Intermediate commit towards fixing issue #4 [Unstable]