Merge pull request #1 from jordankueh/jordan

I approve this merge. (Because it's just me talking to myself at this point)
Merge pull request #2 from jordankueh/jordan

Version 1.1 Merge