Merge pull request #5 from DLive/master