Refixed issue

Author: @akshoop
Merge branch 'devel' into shoop_REALLYfixedDoc
Merge pull request #100 from SixAppeal/shoop_REALLYfixedDoc

Really fixed doc this time