Fixed #103 Overloaded functions bug + Unit tests