Fix some errors in code
Merge branch 'master' of github.com:acsellers/ar