Merge pull request #21 from dmwm/master

Update branch from master