Merge pull request #7 from greenfieldtech-nirs/develop

Merging back to Master from Development branch - clean ups mainly
The first version after the fork from Nir's repository