Fixed a few issues.
Merge branch 'master' of https://github.com/Visitor15/Nuesoft_Medical