Updated copy & merged changes
copy update
Final fixes
Merge pull request #6 from trystant/master

Final fix