Updated with latest changes
Merge pull request #2 from morganhi/master

Updated with latest changes