Merge pull request #4 from GSORF/adam

Merge new Features from SVN to GIT
Merge branch 'master' into adam