addressed run time errors
Merge branch 'master' of github.com:ekwan/mandor