Merge pull request #27 from red-admirals-2014/linkedin

Linkedin
this is for reals the real thing
Merge branch 'master' into linkedin
For reals fixed this time.