Code update
Merge branch 'master' of https://github.com/dfrister/Practicum2014.git