Patched better messages. new commit with fix