Merge pull request #696 from alblue/nsdecimal