Fix compile error.
Merge pull request #190 from khogenso/devel

Fix compile error.
Merge pull request #21 from asfadmin/devel

Devel
Merge pull request #22 from rudigens/master

Pull latest changes