Merge pull request #28 from talentral/master

a bunch of goodies