Changed operators a bit more and added secondary copy constructor
Merge branch 'develop'