Merge pull request #5 from Magenic/master

get Justin's changes