Fixes builderrors introduced in previous merge.
Merge pull request #379 from hean01/master

Fixes BUILD ERROR in previous merge