Merge pull request #16 from tank-bohr/master

Change prompt regexp for telnet client
Update changes to prompt parsing