sigh.. Readme is the hardest part.
Merge branch 'develop'