Merge pull request #9 from JordanRL/dev

Dev