Added Neiman; Fine-tuned parsing; Added Keep alive Ack
Merge branch 'staging'