Merge branch 'refs/heads/master' into development
Merge branch 'refs/heads/master' into development
TER Release 0.5.1

Fixed issue #17
Merge branch 'refs/heads/development'
TER Release 0.5.1

Fixed issue #17