HD options added and some changes in existing code.
Merge pull request #16 from rmariuzzo/feature-hd

HD options added and some changes in existing code.