Merge pull request #15 from daimos/master

issue #4
issue #13
issue #4