Merge pull request #1 from isao/develop

refactor with some minor added features