Adding additonal features from Dr.Paul's sample
Removed bin files