fix issue #26#29

akbargumbira merged 2 commits intoid-python:developid-python/members:developfrom

sakti:developsakti/members:developCopy head branch name to clipboard