Merge pull request #1 from innotech/master

Merge form upstream
Merge pull request #2 from innotech/master

Update from upstream
Merge pull request #52 from h2non/master

Update from upstream