Merge pull request #62 from seavor/jay

start implementing errorMsg functionality + small fixes