Merge pull request #1 from phundament/master

merge all changes