Fix Issue 25 26

This is for fixing #25 and #26