Merge pull request #47 from ncaskey04/dev

current changes from master dev