Merge pull request #1 from termMed/master

Update of latest changes in development fork
Merge remote-tracking branch 'upstream/master'