Merge pull request #1 from alunny/master

merge latest updates into mcgrews3-fork