Merge pull request #32 from ppatriotis/develop

Update Develop with Travis tests