bug fixes
Merge branch 'master' of https://github.com/adamaoc/mvc_ampnet
bug fix