Merge pull request #13 from ecomfe/master

merge
issue-310
update
Merge pull request #22 from ielgnaw/issue-310

Issue 310