Updated formatting and parsing for GitHub wiki
Merge pull request #3 from itayw/develop

Updated formatting and parsing for GitHub wiki