Merge pull request #181 from brucehoff/develop

stack-60 compatibility