castano Merge pull request #22 from zeux/msl-const-fix