Merge pull request #229 from achernet/bug_fixes_194