Merge pull request #4 from theolesband/master

merge nicklmarks local with theolesband master on godaddy