Bug fixes - support different origin ip addresses
0.2.3