[Updated] Resovling issue #35

Based on discussions in #42