Merge pull request #19 from kmjungersen/dev

Dev