Merge pull request #82 from curlee/master

copy fixes & updates. style changes.