Merge pull request #29 from nromanen/master

Merge
Merge pull request #30 from nromanen/edd

Merge pull request #29 from nromanen/master