Merge pull request #2 from projectdnet/master

Pull from origin
Merge pull request #6 from d11e9/master

Merge pull request #2 from projectdnet/master