issue #14: done
Merge pull request #15 from rnmp/issue-14

issue #14: done