addressing build errors due to optionals.
Merge pull request #7 from sky1234/master

addressing build errors due to optionals.