updates #2: bugfix
Merge issue-2 to develop, bugfix. (#2)