Merge pull request #2 from macheretj/experimental

Experimental
Merge pull request #3 from macheretj/experimental

New code updates
Merge pull request #4 from macheretj/experimental

fix
Merge pull request #5 from macheretj/master

fix
Merge pull request #7 from macheretj/experimental

Fixed blocking bugs, server script now operational
Minor fix