Issue #9: fixed copypasta errors
Issue #9: fixed formatting errors
Merge remote-tracking branch 'origin/master' into genetic