Code tweaks
use simpler test cases
Merge branch 'develop'
Added copy constructor
Code tweaks
Code cleanup, more comments
merging