More Berapa compile fixes
Merge pull request #14 from reenigne/master

More Berapa compile fixes