Merge pull request #4 from vongosling/master

merge from master