Merge pull request #10 from jmr12345/dev-3

Updates/fixes