formatted
Merge pull request #95 from Qwinix/issue_75

formatted
Merge branch 'master' into gh-pages