Resolved Issue with Merging
Merge pull request #3 from cranelli/master

Resolved Issue with Merging