Changes from guillimin
Merge branch 'master' of github.com:guziy/RPN