Merge pull request #13 from TJ-247/develop

Fix