Merge pull request #6 from tcpcloud/add_fixes

add fixes