New fork

Fork from original class skeleton
Merge pull request #1 from danielduan/patch-1

Fork original