fix standard compatible problems
Merge pull request #16 from miller/master

 fix standard compatible problems