added parse
Merge branch 'master' of github.com:zfeuers1/MA