Latest fixes and updates
Merge pull request #2 from morganhi/master

Latest fixes and updates