Merge pull request #77 from DigNative/master