Merge pull request #11 from ecomfe/master

merge
Merge pull request #12 from ecomfe/master

bump to 1.0.4
issue-302
update
Merge pull request #21 from ielgnaw/issue-302

Issue 302