Merge pull request #3 from iampseudo/master

Update dev branch - live site test complete.